Merge QP1A.181202.001

Change-Id: I9dc3989d90582725f4b42edcfdf99611de787a25