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

Change-Id: I5b4dc5c5f6cdb6527fd17fe1aa262f7b74c380eb