Snap for 6602839 from e767edc325 to mainline-release
Change-Id: I072cedfcadfd3d71b237912d6060c1367b0ab5cb
This commit is contained in:
e767edc325 to mainline-release
Change-Id: I072cedfcadfd3d71b237912d6060c1367b0ab5cb