Merge QP1A.181008.001

Change-Id: I741e2e45d055d8134f84cff158bd94f01a7bd654