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

Change-Id: I3282b35970821c6d1f6da0ad7ceef07f52baf61d