Merge RP1A.190822.001

Change-Id: I6ff73e7be91ce2dcfc6c21a846953cd80e3a9a02