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

Change-Id: I807d6cff3e5758ae1e716361bf7b49f096b72d22