Snap for 6559824 from 9c268ce5a6f28bd61424fbddc3fd970835d6aba2 to mainline-release

Change-Id: I130a5bdf3a65a60a9ef5fcc8e0e923dac9d82cdb