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

Change-Id: Id89381ac0e9900f2cd0cc7bf1e947c6edbfbbae9