Snap for 5590969 from 74636406cd10b404c9850c29245baa9a8a786906 to sdk-release

Change-Id: I29d6cce72e7f9f5bfbe856d2f4dace4ff06c9175