Snap for 13198286 from 0cf00b757b8d5ba249faf8c3c9560420bb622343 to sdk-release Change-Id: I1a57bfabcd8b49f14fbb8071dc721b7922ce5a7b