Merge QP1A.190228.005

Change-Id: Ie8113826dc3158749cf2789348f1e630143f20b4