Snap for 10453563 from 3263e306750cd4f450799a37b5b3351a147901f1 to mainline-extservices-release

Change-Id: I20493e6776839a3db8aeefcbfa1a8b8c84ce7654