Snap for 8952093 from 7febe9feb40df796f100384b8ea729b9c0489522 to sdk-release

Change-Id: I15ff1175169506ca0f8865753518fc02fc6b73dc