Snap for 13198286 from f854e56334e839bb1b49c0c9ce12e8cea6f814b2 to sdk-release

Change-Id: I5b6f2c0e7402e47f83c87af326f3b6bb03fd3347