Snap for 7229773 from 0dc5f4bc799240fff965d9deef78e0ad33185b2d to sdk-release

Change-Id: I31343ff98bfa14f827b4b980ea8db28bcc5beb4d