Snap for 5234541 from 7cfadfd35c490983f94c491d8c839b673cfa7a3a to sdk-release

Change-Id: I538f94e88d0172101439ca700b4939eb96b9ed6a