Merge RP1A.200409.001

Change-Id: Idf7f1587027bdc3f7602c385744580e4f3ba03ac