Sync with master fastboot.
am: 98699eca48  -s ours

* commit '98699eca48a72f18dcdc551b44a929d00c3d400e':
  Sync with master fastboot.