Snap for 6517089 from 063267b01754bf29ae1dc6b3554c9047fe677842 to mainline-release

Change-Id: Ieb0376d91a23f03d24c1d1c61be555af59e39ea7