Merge QP1A.190107.001

Change-Id: Iae658f959d69516a5492f7232d365d81abf7d755