Merge QP1A.190228.005

Change-Id: Iaf6b6d9a9d673a3bd61210e81ccae7d675a6cb22