Merge QP1A.190609.001

Change-Id: Iaed92625b103b0a750773fd9f7d5c6c7082a187c