Merge QP1A.190523.001

Change-Id: Ia3f2c22acdbcbb295d11031f7f9a355e3f460d97