am dcf080d5: am 56a794f2: am 96e30774: am fea4b4dd: am 3450dc32: am 06018d92:...

am dcf080d5: am 56a794f2: am 96e30774: am fea4b4dd: am 3450dc32: am 06018d92: am f41a380b: am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp

* commit 'dcf080d5':
  resolve conflicts for merge 5a7b3b65 correctly