Merge QP1A.190122.001

Change-Id: Ic5334a0862cba05e54ae328f55a67e19b6ee0f9a