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

Change-Id: Icfa5bf522c89a3b49525fcaf1175875509f0eb09