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

Change-Id: I8dd30f51e774a5f6624e7705d24da610955caca2