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

Change-Id: Idbe285c05dfb9b4b6252ef87a3066f8a41f13044