Snap for 13198286 from b5728684f348ff0cb6ad64da16ab572c57e0ba16 to sdk-release

Change-Id: I4de110e1810624af0a920534ad96b8b912eda246