Merge QP1A.190107.001

Change-Id: Ib2270c95dfb5be7685b6499d60652576a8f06387