[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 16ae7719a9 -s ours am: c0b278b465

Change-Id: Ie11349ec4f08bccf4ee8d736a30eb5b4374fce75
tree: 29ab62d90a15df69c63cdf292037fc5675b7fb1d
  1. android-5.4/