Merge QP1A.190107.001

Change-Id: Ia4878a91e8b7d6443b187175feafebca6c276d10