Merge RP1A.200204.001

Change-Id: Ic4636d9f99bc94070b1dfd61b225741d04451551