Merge QP1A.190228.005

Change-Id: I57ff3dea49f27456db20b5fad786b19623c74957