Snap for 5925869 from 48ac1fcf49fb23895e9eaa1514e3799a4e3cc6a9 to sdk-release Change-Id: Iadd587c89ccf5d8f1601e1018cffe241fc99882c