Merge RP1A.190822.001

Change-Id: Ic7f186b44535555ebfab2e6cf37152619ab7fbd9