Snap for 7821744 from ac3fe15122aafdf10b153e2dbaeb05a0c1d770ad to sdk-release

Change-Id: I1cc360c57f3356abb86aab9ee7daf4e1a43e00af