Merge QP1A.190219.001

Change-Id: Ia16e6ed1a649f6c4e9cb8f0c63eefd03b71abc3f