Merge QP1A.190228.005

Change-Id: I3a2f0f6068624497f38b203ce8f5a5be14913073