DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 011636b08c

Change-Id: I15161c269ec5d68766e60f55a36482f95cfd0c77