Merge QP1A.190228.005

Change-Id: I121c40563f8b77d32b3b2be76e4872f68116c927