Merge QP1A.190228.005

Change-Id: Icf6279e001deed10b9c3b298532c73e6fce1fd48