[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: b740c5e12e -s ours am: 44f2e45de2

Change-Id: I7435ae0d248f39161141745a55dfd36ea0112b02