Merge QP1A.180918.001

Change-Id: Ib8aa7b02884e96c9bff0624e5cb7ea1a7e2ed86d