Merge QP1A.181202.001

Change-Id: Ib44477ad9a9c4e5b97204bc5f1ce6b0e7f8101e8