Merge RP1A.200123.001

Change-Id: I3791d574c8ce10a967254ca803579f18eb8a6804