Snap for 5590969 from 036b111df5e0f73236a6abe8d59aae0ea28d217d to sdk-release

Change-Id: I912ace7707323a111d253946ec80adc16c7ab4b4