DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 0e97c9203b

Change-Id: I403171c5ca77fb61d011d98d93f0a4161d6ee070