Merge RP1A.200512.001

Change-Id: I20a8e78672d9ab39309426ed4ec9a38563c5e026