Snap for 10214594 from 5e0871763c6ee8763d06d302c409f15e4f2411cc to sdk-release

Change-Id: I422e0776ff79acdb90463bb68a9df2bdaef200f3