Snap for 10594189 from 2dd382442ac3848054e259053df5c67987268754 to mainline-extservices-release

Change-Id: Ie168f3e61e212adfd83b8e7619f6341a8dd3e5b7