Merge QP1A.180823.001

Change-Id: I3dd770f2c7ba776b7037f93b9c2c6a2529ca6877