Merge "Daydream -> screen saver" into nyc-dev
am: eeaaf26

* commit 'eeaaf26805091cad0404bc6030dde38dd4b1edcc':
  Daydream -> screen saver

Change-Id: Ie6aa6ba3260f9d67ee41d129fae6b7f6f01d039d