Snap for 13198286 from f01aeb3b386a8aa2b7836abcd08c85a4681a6e79 to sdk-release Change-Id: I836e977458a6e3f68919238648e68ae160dc948f