Snap for 5590969 from adaa6191d50dff422f8ed9dd71306d84449a96db to sdk-release

Change-Id: I9f08e47a3f0497c7d4efb099b0f410ae156f196b