Merge QP1A.181022.001

Change-Id: Ifdb9b9b1ac13fdb29151a0d9ff0e87c643ebfc68