Merge QP1A.181022.001

Change-Id: I911ec787fcd0b88e3570d78863452981854ade91