am b8ce03f4: (-s ours) am 91245482: am a10f83bf: (-s ours) am f5fb9cab: DO NOT MERGE Fix for Holo failures * commit 'b8ce03f4': DO NOT MERGE Fix for Holo failures