Snap for 8253222 from 2b0dc148339bbb2e56e5746343ee385590b832d1 to sdk-release

Change-Id: I51991f69839de005df9aea0cf05c005093423e3f