Merge QP1A.190228.005

Change-Id: Ie7d477a393905741cc5ce9cf747bf803234e604b