Merge QP1A.190228.005

Change-Id: Ib3ae3cc5c1a8e8095153d2ec89b9fc41e46acea5