Snap for 8564071 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-extservices-release

Change-Id: Ied28f4297dd4bd6d29b5bdbdf9bc545258fd1a6d