Snap for 5925869 from 45aa5d3957ad9eb791ed3c92a8543af20d575578 to sdk-release

Change-Id: Id7bdfb14aaacd458cd7788e75a3c2b1e69e903af