Snap for 5234541 from ef770d0dfcfe1fe2163d6c315351d593dfd7e94f to sdk-release

Change-Id: I7fa32737b91206f21f9bb4f12dbe1fafb7b5015c