Merge QP1A.190122.001

Change-Id: Ia9d50c08eed705eea6961152a3eec4873187ec5f