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

Change-Id: Ia0ec8a0222afd3058a8ee165cf4deb85462a2869