Merge QP1A.181202.001

Change-Id: Ib85596db3f7b0ae11663542f1011c7dda6a78a64