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

Change-Id: Ic6d6b2eced45d1ce5f0ac142bece9befeaa19717