Merge QP1A.190107.001

Change-Id: Ifc2391e6168ae0e0fdb96f134267f2a7df92591b