Merge changes from topic 'ab_sideload' am: 3750ed3e17 am: 93ff77ad1a am: 820bc82bed
am: e8fbea342f

Change-Id: Icaf2990451a61fc7e62ae9f2d87f30f0197a31b1