Merge QP1A.190228.005

Change-Id: I63bb37bd6016da71f6e0c7a8ad393f28489d85e1