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

Change-Id: Ifa13070661681976c09919aab8829b041735a498