Snap for 8554636 from 3c86c080a8c385753ff8161d26c9e3fd0aa1547b to sdk-release

Change-Id: I4adaed594eb4fe3b72aeb8ce028802e8951da438