Merge QP1A.190228.005

Change-Id: I8d01c42ff10c518cca7ac6e89f0cc67fe2fca004