Merge QP1A.181202.001

Change-Id: Id0c6fc34ee3ecfd2f098ff1cbf4bb5e0db12a76a