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

Change-Id: Ifb5eb402907f37dc16c4bdf3bdb4fe86037779ef