Merge RP1A.200401.001

Change-Id: I30adeb04788958dab39fec396c6c302f9a132d14