Merge QP1A.190228.005

Change-Id: Ia3ea1461c90e0e338d239f08658f1c241010f74e