Merge RP1A.200518.001

Change-Id: Ied74600a4198b6cef746ba036bdb6f51abb15fcb