Merge QP1A.181202.001

Change-Id: I74a9f1f9cd714e9b45edfbad86e8f30c75af7f60