Merge RP1A.200504.002

Change-Id: I58ed25df68de616ae9f89e7be902a536aa2d0d0f