am f5fb9cab: DO NOT MERGE Fix for Holo failures

* commit 'f5fb9cab70a0563af35d487fe9eda09853c72884':
  DO NOT MERGE Fix for Holo failures