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

Change-Id: Ia347c93aca7dc02b3c510bfb6765d98ebfda0e1a