Merge QP1A.190501.001

Change-Id: I4b67d3e45475ea0ad1faf72ff894ef8c2ef49fb2