Snap for 10929834 from 7e7a774e315426f7eabfebd3d2b394ec3cb81808 to sdk-release

Change-Id: If5320c91bd8e14596d6b25bd6d13a347ad30e516