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

Change-Id: I359059c4b96248aba45843acf7bff31ecc37b841