Snap for 5234541 from 0ff97691c937dfa093f3e685ad23cad3c7e03dd1 to sdk-release

Change-Id: I81a1c1a91bc9ab4aa54fd9245bbd663eac9baf54