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

Change-Id: I8eec36ffb363954ccf77bde3f7f6a1fc7d7d273e