Merge QP1A.190107.001

Change-Id: I205303fece7ffafb523ac5e8ba38ce92996adb4d