Merge RP1A.200106.001

Change-Id: Icc6ce97c6a809c9b0e0ff0b6e8c8af0ace5ceb03