Snap for 11962796 from 910c9b699c985d7bb4278b3a34c71e682ee5aeb6 to sdk-release

Change-Id: I319e1e3ff7fabcee762c785a855ea52c43a17e90