Snap for 6530637 from bfcbc6d77a1492f5d6b90a272ec532f0db08ddaf to mainline-release

Change-Id: I0bf475a202854de84fc8caa080853d4271a26717