Snap for 13198286 from e9bece2bd8ef8d710ea7e535dce2a05487bd56db to sdk-release Change-Id: If0e28ae7bc0e931c1e1d11339ba05b53b88c95a1