Merge QP1A.190228.005

Change-Id: Ia7f176719dbf000ce44fb9deb724f26f439299ea