Snap for 5590969 from 584a05c4fa7de82310d27a092e5116a11ea04cf3 to sdk-release

Change-Id: I8d403f75885ffabb96bd5db4b1f46e7e3051ff80