Merge RP1A.190822.001

Change-Id: I89e4606cf65079542c26d343d3ca0eb24a39d82c