Merge RP1A.190822.001

Change-Id: I142ff9a6b6924ece5f835210404a05b43c4ee9b1