Snap for 13235685 from f3d7706e7b77187eafe4b645f5aca2bd082a3463 to sdk-release Change-Id: I168888cbc3b7e966f53211990ad892c10b904fe8