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

Change-Id: I0ca29bb3e18954e958687e8f139e2035b8fa0583