Merge RP1A.200414.001

Change-Id: Ia2e6e04c82ae81d4ff0c6833b34f6f4a624879dd