Merge QP1A.190122.001

Change-Id: Ifa8de5cb538ceb23a6dda6c10a770acbf9c3222e