Merge QP1A.190228.005

Change-Id: I8564885bce2138184c921a53e4f7c16a8951fe9c