Merge QP1A.190228.005

Change-Id: Ia2842c32d25821f05bcc365e9f3b13d9cb6e0c16