[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
am: ff62169b99 -s ours
am skip reason: subject contains skip directive

Change-Id: I91b3ce85b85e8e2637667cf1af0e3f75b423258a