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

Change-Id: Id33aa423a354cf61baeec8b0f36a7e1d62d0d326