Merge RP1A.191212.001

Change-Id: Ib2e174d6b8488cb1b904c452e712a1fd14326972