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

Change-Id: Id2594c8f41a6fc0d75b290e83c6e9b23d9b4a43f