Merge RP1A.200123.001

Change-Id: Iaf3b9daa7881233473548f811c3cf743621a46ef