Merge QP1A.181008.001

Change-Id: Ie2e6960486a07085d1f9af4c301c7eb09ba2c1bd