Merge RP1A.200423.002

Change-Id: I0c91751de0ee4459848b36adc181ab7a7e068275