Merge "Workaround to get passed the broken install flow" am: b0e6508a5b
am: af657ae978

Change-Id: I57ba9c85e4d5b4e301cb14ba068430c4454a4978