Merge RP1A.190822.001

Change-Id: Ibbb78228f106f263eb3be7060f15b97fc2554739