Merge QP1A.181022.001

Change-Id: Ie9aabf993bcb1822ae4dd1c8b69c07d65da655b5