Merge cherrypicks of [13535891] into mainline-extservices-release

Change-Id: Ic18a0908cb99323b8944d77b3bb11b2255ca2ff7