Snap for 8554636 from 82d8bcd3f748d9ecd10c972911ef1d3cb4e45e3f to sdk-release

Change-Id: I6a86e6d98ad696bf8581140ed53ae3a2f9dfd905