Merge QP1A.181008.001

Change-Id: Iaea0e87f3f50779f817dd0dc0852f17f9483d57a