Snap for 8419271 from 44019704a61971be4445203558c53cd0ad3842b5 to mainline-extservices-release

Change-Id: If57cf287e0dc6971fa46883585c26a184533a4ce