Snap for 5590969 from 61eae8ffd1a16c89db1c01e95afad67cecfcbe09 to sdk-release

Change-Id: I6a4f1ad44388331d591ece67e1125c33d446a3ef