Merge QP1A.190205.002

Change-Id: Ib686ccbf8000cd4b502f4f5327e4dcbeb2c45808