Merge QP1A.190228.005

Change-Id: Ie15bd2ec738d7a5a40672add6603e2861031af87