Merge RP1A.200409.001

Change-Id: Ic8a4c1cec4968b8a8036478dd244b09e085cb65d