Snap for 7187421 from fdac598f63b3647b373800daace4dcea6fa9ef23 to sdk-release

Change-Id: Idb3a69837d4bbebb45cd19f606344c9d2b9bdbdf