Merge QP1A.190228.005

Change-Id: I9e135dce4a5babf1e44036b48c7cae5bc073aac2