Snap for 9361261 from 7e2a46ab9b8c31bd51eccd2f5ba296a27aff9133 to mainline-extservices-release

Change-Id: I5c4b5e1b061b1b967289d82f68395ee24428c9cf