[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 789adcd0fe -s ours am: 961d7e41ff

Change-Id: Ie842da5f338495d177f75ccde0ac1d958e7e12c5