Merge QP1A.181202.001

Change-Id: Ibe01f88e9446e9ebb919f384746a161c3fd1278e