Merge QP1A.181022.001

Change-Id: I610258047190378a28d97123de386f0c0f71671d