Merge QP1A.190212.003

Change-Id: I92cec0fb8f98ceb90569c67cc658a0a3d63ae2a8