Merge QP1A.190205.002

Change-Id: I8e29d3d840642579119f10af2f90dd536304070f