Merge RP1A.190822.001

Change-Id: Ifec40ce5e3399b493f7b624ec2378f03a68a1fe6