Merge QP1A.181119.002

Change-Id: I1d40ba4304bef9a470ad222300b38d5e2266a711