Snap for 6366237 from 8f817b47fb6275aee239ad0f17e4b9d259de2005 to mainline-release

Change-Id: I7e4ec3493c6e1bffce63127011c2a13c64fbfde9