Merge QP1A.190107.001

Change-Id: I9bcf89c3fa917ffa987c37dfdecb8f8b4eac3ed2