Snap for 6533464 from 4df270a982ae50eab348a1c29c22682b6cc409e4 to sdk-release

Change-Id: Ia1caa159d4433885922caa70647bb9b629b80ec3