DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: c09f2cbde6

Change-Id: Iac2634e20061fcb128031ef8b6b98a8773c579f2