Merge QP1A.190107.001

Change-Id: Ife0402f9f6166a53c75fa57f80dee0b442ce6d28