Merge QP1A.190122.001

Change-Id: I70c1f74f8fa7c7fd503d7297de85381af2979778