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

Change-Id: Ia39cb8f53a273990b1bf13d6d5e735c94ef41594