Snap for 7183507 from 4bf3935345c389b4e1643c268e4c0c3f20beb8a1 to sdk-release

Change-Id: If1a2bc083f9d1107271d05615552a334daeae9b0