Merge RP1A.190822.001

Change-Id: I5996523c29eb693946463fc57480ceeb5c8e85b8