Snap for 5590969 from a9ac247af2afd4115c3eb6d16c05bc92737d6305 to sdk-release

Change-Id: I76997c70bf7f532cd016baa5fae9ec0d1cf07099