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

Change-Id: I4185fafedbf5f7c68cc2292e2935262105b7ff12