[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 4c26c52ea3 -s ours
am skip reason: subject contains skip directive Change-Id: I9c99d7bda402e893fa10c9154c9b2e134cab33d8
This commit is contained in: