Merge QP1A.181022.001

Change-Id: I88653ceab4b4c8051120e3c3ccbb1cc237c8dd25