Snap for 11106172 from 230dba8205e6f65e401786f4082a7e55b11cc8ee to sdk-release

Change-Id: I4af8af4235fdf0e68d91ab74c042588c2d5b76d9