Merge QP1A.190122.001

Change-Id: Ia1d180f8182a1dbbc04c79faf1abf6e3ed38f6b8