Merge QP1A.190122.001

Change-Id: If47143bc178937c74b0fa705ad1eed57a9468068