Merge RP1A.190822.001

Change-Id: Ia1fd99ae7322f6240d49db1b27dd576d30b0b835