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

Change-Id: I1a445097e44e11155ecec6d60eae3ee240d5e4de