Snap for 6877830 from 4b0aa95ee1bd580b46878da4e8fe7581622f4f78 to sdk-release

Change-Id: I18d23d2b53b933c47b1e564ff7e348df705e7a7c