Snap for 10453563 from 495bd26a973c32834671073f381f373d2c5b407b to mainline-extservices-release

Change-Id: Iae3ac8d92ba9088c3219ddfaf50658cc1840f032