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

Change-Id: I194a02517e6a7434428bf3f4df8e367226163053