Merge QP1A.190107.001

Change-Id: Idc37dede4c1e3817404f976991b944c3640c5ff4