Merge QP1A.181022.001

Change-Id: I80b150fb72f534d35ac0fd7074d699682fc36bed