Merge RP1A.200414.001

Change-Id: Ic59bb3ca519b6837c6f9ffa819060f92301ce388