Snap for 8167433 from 8f1d07688fcf609e7f6fbb55576e78958f09f617 to sdk-release

Change-Id: I6308f5b73d932f15b095712d8db1c17ea7c18003