Merge QP1A.181119.002

Change-Id: I8e3d1af555e04aa4c39247c6cf88d387eb243679