Merge RP1A.200106.001

Change-Id: Iaf4c643e9b30d2fff32baeeaf8de606584b10893