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

Change-Id: Ibe5a62d65fd64c57749a2fae63498ee16c20c56d