Merge RP1A.200428.001

Change-Id: Ic4b5e31d9487a58e461ec926707a75ea18990cc7