Merge RP1A.200511.001

Change-Id: I50afd3414d6e12891cb45e5d6fe4a8c828830b50