Merge RP1A.190822.001

Change-Id: Ibae7d8662f87a43c53232201c8124ce5b162919f