Snap for 11174750 from 0d6408be36dcf73eed576dde12bb756ea8edd129 to mainline-extservices-release

Change-Id: I363f337762ab93371318ff1f1bcac6b9e694fbda