Snap for 11812660 from 9714bfdc4ada124095c861646f96e8a7cfb7ddca to sdk-release

Change-Id: Id4bdde403f6f49e608711249a5a03c6cfdfcbd89