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