Snap for 5590969 from 531f66d59ed0c30a783ea98137abe367e2fc3f20 to sdk-release

Change-Id: I45f3538cd077085fc6c68b5473d5d4df3ad558a4