DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 19ceebd5f8

Change-Id: Ia751b7762b187f89b38189fed625acd7731deee6