Merge RP1A.200106.001

Change-Id: Iee11b13dd0e7c23eec8631782d4740ebbd47e15f