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

Change-Id: I9a5d6a08ea86ac59fe133cf400169a58ce6c02af