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

Change-Id: Ib01011b8c0a49b58028ba03c630c6b42cd9c9b06