Merge QP1A.181119.002

Change-Id: I0c10d187b5abc984e677e706004ed56bb7858091