Merge QP1A.181202.001

Change-Id: I0979c437416def34f7b2a3f5b238fa3bbec9a8c2