Snap for 12349386 from e5904f89b95de6c95914a270b295d57b73dee74c to sdk-release

Change-Id: If7a912c652df1345a77d908c0783d702da7d87c6