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

Change-Id: I7e4b32b320b7a319ed3168c58a499c75024b920d