Snap for 6413355 from ce6458dc6d7c6686ab9a4f966abe39cf95b9de0e to mainline-release

Change-Id: I4a4dab4306ca6a956336e88ed7e99593ce2f23bd