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

Change-Id: I60b516f8f7f239e1f49f43d7cd6f386b570841c1