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

Change-Id: I6765b9545b89f1f7b6b604d26fcae3e5ac0212d8