Merge RP1A.200511.001

Change-Id: I510dcb9b4d80a284d8c6aa888640906886049ec8