am 5c8f1352: (-s ours) DO NOT MERGE Material theme

* commit '5c8f1352e4762d49184112a948628fed32f4639a':
  DO NOT MERGE Material theme