am dff8afe1: (-s ours) restore holo UI in recovery -- DO NOT MERGE

* commit 'dff8afe1b21c6ffe09269434f9f8f0d166e1a848':
  restore holo UI in recovery -- DO NOT MERGE