Merge QP1A.190228.005

Change-Id: If814fb4b8813474e18805b4e3585828535a99362