Merge QP1A.190228.005

Change-Id: I9de89aa3d280828bdf5e700872e6145e2729cc09