Snap for 5303890 from 3e3664bdfab6b9dfa7ad10e9da4577e2759f8424 to sdk-release

Change-Id: I039cc0dfad5b3417be93e5f8474c679eae8c44df