Merge QP1A.190212.003

Change-Id: I31209d01478ddb276bb81b2c86a29043ae684b49