Merge RP1A.200123.001

Change-Id: Ic1089bac48137dcb536e2564158d50420419d740