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

Change-Id: I49ba2b605ad68e862a3a39b7d7450680df793f89