Merge RP1A.190822.001

Change-Id: I9bc56d05997cf65e07b378bb8d8cd6dda971648b