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

Change-Id: Ie0083e4800ea2e6105cf41ef228ff2ce4a621bdf