Merge QP1A.190205.002

Change-Id: If44651c446d0039de6d5fd696cf74a6465ff7e36