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

Change-Id: If74e9d0ff6820cf1476071b93fd9fdcd02847e38