Merge QP1A.181119.002

Change-Id: Ic1e118feb62dd16ab0d2491b3720d77f468c330d