Snap for 10399941 from c71e40dd9fe8a03204b261e48e27c1550a2f1a9d to sdk-release

Change-Id: I322ebe8b8c23caef2a5861700f04032ded98bb8e