Merge RP1A.200518.001

Change-Id: Ic1b74080d8b9a971af986c0ffe96d2c948df957e