Merge QP1A.190523.001

Change-Id: Idf08b7afd281eae8373cc0014a56f8df12dbff3f