[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: dbeff27894 -s ours
am skip reason: subject contains skip directive

Change-Id: I1a600ff21032dee6746e145ce6df6cebd48cb0a4
tree: 91044a36c8de378ec60f8483b94c4fffc332a436
  1. bluetooth/
  2. nfc/