Merge QP1A.190205.002

Change-Id: Ie950ada8bb63186fbd65baf27de34385dfdcee16