Snap for 8952093 from c3a5fc0e91d7b9cd3de426eef8d4ba17eac14eb7 to sdk-release

Change-Id: Ia96409c6561063f2eb1f1293473b32ac9fcb05ce