Merge QP1A.190205.002

Change-Id: I2eca569ff43537efcc56375e0d59335afefb7ba5