Merge QP1A.180918.001

Change-Id: Ifda36cba7c76cb7dfd3ddc34ec762ffcf6adc218