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

Change-Id: I5403e19c05ddcc96d4927b7280755a1507f6df61