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

Change-Id: I18a7738fb023f4a729640dd16f3e5ac42f7d4d6c