Merge RP1A.200417.001

Change-Id: I8179478fc1eb1e98b92cd8635c35087cbb900079