[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: a7d36a4257 -s ours
am skip reason: change_id I64a01331273216829533f69f4422036e5598a547 with SHA1 c12771af1e is in history

Change-Id: I5c4bd8739537963e42d2ecb041cab73e497f953a