Merge QP1A.190212.003

Change-Id: Id53bfa21dae871b31f2606f8f9fc1531f326d72f