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

Change-Id: I4df791e3fbf2e76eddc0f276b003a8147d1f9480