Merge RP1A.200423.002

Change-Id: I87939a0e0c35c804adab0adf9225e01ba5a301d1