Merge QP1A.181022.001

Change-Id: I7ef41f4c0fd9d14876993dec297ae4834a272279