Merge QP1A.190107.001

Change-Id: Ia807d68d67a9daeeb2eaa89cf07cb1065b373482