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

Change-Id: I53e87ffa9b0c42225d3a1c1c8357beb941cff7a0