Merge QP1A.190122.001

Change-Id: If28c746b4f6ee5b729ef156e59d00c4be9d683db