DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 596fee7ca5 Change-Id: If388187c2739067d4d6eaaaaf64a572fa7b28878