Merge "Fix sideload for user devices by adding a new sideload config" am: 1254e15e50 am: 94e5553f4e
am: fae21617f9

Change-Id: Ida5540b8e9279ccb717c6efc5d4019ac627789a3