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

Change-Id: I07cd93c69a6309e210141914a67d8b2d3f1c5f0e