Merge QP1A.190107.001

Change-Id: Ibe7396c119ae26c053a6e44d382bd91ba3e3a106