am eb754fc0: (-s ours) am ca49f477: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit 'eb754fc01b4e1f1a664ddbe375d56f624a053d19':