Merge RP1A.200601.001

Change-Id: Ie142e36fee14ba6bfe2437c2e345286cd87d290a