Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master am: ad45cff8d7

Change-Id: Id091b31f3f4dcf3b722540ef677f4f29662fb13f