Merge QP1A.190324.001

Change-Id: I0e4a41c719c05bc55ed207c89821a09c2879f17b