Merge QP1A.190107.001

Change-Id: I204e27fd4e844b99b7db27fc3feba9d083a486f1