Snap for 10453563 from 8cfa3cf18049bb756eb0013ba512dc1aac7ba8d1 to mainline-extservices-release

Change-Id: Ic59b536ade233006f789bd95415a8354ff147cd2