[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 58d082ff97 -s ours am: 67012670f8 am: 10c9843bf3 am: e94bed9a0c -s ours

am skip reason: subject contains skip directive

Change-Id: Ibd7eb00792da5775943a4cd37fd472e777eadd0e