Merge changes from topic 'nyc-mr1-ue_sideload_recovery' into nyc-mr1-dev am: 4d5fe6401f
am: 0101a72c47

Change-Id: Ib0ad60c8d139e517cca0a64c9181959f931d3b5e