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

Change-Id: Ide5c76978fe9200553f82677829a5bd69d67d39f