Merge RP1A.200511.001

Change-Id: I12106709805d44fb7a22acbd1e4a84c296e298ed