Merge RP1A.190822.001

Change-Id: If6b67208c2017c3ce13d3104d7ec7224e53bd5ce