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

Change-Id: If6e18a83f138c3b3a4ecb0201d8f8157e122ed04