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

Change-Id: I1b7403cb539da51e9f3b93947ebfa6eec36df80b