Bug: 140308332 Test: sys ui boots on hawk Change-Id: I111a5eef67ebe599d65b96687643cf1949d6bfbe (cherry picked from commit 481a1040)