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

am skip reason: subject contains skip directive

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