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

Change-Id: If7a63e4c894c11bf50a03139f5fca6ad0239acc8