Merge QP1A.190228.005

Change-Id: If0796a1d0e9721613f6a8ca75a45385712ffd7cb