Merge "Fixed NPE during boot animation on fugu." into nyc-dev
am: a1e7be3

* commit 'a1e7be375e618544e22287d0ee59f517536f95e1':
  Fixed NPE during boot animation on fugu.

Change-Id: I7ad54794f82d8b2ebdaa0d57668295f42642abdd