Merge QP1A.181119.002

Change-Id: I294a0aaeedc005a1bc5c65e6dec6de5abb30099e