DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 715174bb0a Change-Id: I3add678885e382c69d988211e5fb73ad1f162049