Snap for 5798008 from fc9bbd1d998e8160fb4c0740f2c26b5dba796212 to sdk-release

Change-Id: I7654beac65763b6e5fd228e379d6f8022282cadb