Merge QP1A.190122.001

Change-Id: Ib6ea9d6c1b6a2ad2a8b4b1a0fab805843eca264a