Snap for 6877830 from 06b2c701dc031bbb97f956e8c5225dc5be8aee71 to sdk-release

Change-Id: I98bed8778abe70cd7aaa42438da289f3211a26ca