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

Change-Id: Iaccc4887e828f759f656828e08fe257e0955bf5a