Merge QP1A.190205.002

Change-Id: Ib76acb3c1f0f7ef20a87096969f2a6109c95370a