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

Change-Id: I8341a03518201a402cc045685bf0ea88a4d3c143