Snap for 5590969 from e5edb67e9c17e1cb272874a1a4c33a7812ae96d7 to sdk-release

Change-Id: I567a9d813da00b49fa9f7272025f5d9d20d53321