am 4f1e514c: am 02fe35d6: am c969a03b: merge from open-source master

* commit '4f1e514c19368a46316e3975cd8ec0855bcc598c':
  Fix device builds