Snap for 5590969 from 37df9eb97e8b1ea96ccf24acbec4690aae2ef1ff to sdk-release

Change-Id: I4b96a8383b1be9469b085e8305767ca0692f63bb