Merge QP1A.181202.001

Change-Id: I2b9f2822681f3fe6b74b7232817a7ee62ef47810