Merge "Temporary workaround for b/122369337" am: 40fade83bc
am: 92d8e8c542

Change-Id: I6ca7cf35019b82d4ed25a299422d02840d186f4c