Merge RP1A.200423.002

Change-Id: Ib934d28f9c06dcb30d34874a00536a2597f4dacc