Merge RP1A.190822.001

Change-Id: Id86098f74a0a4e9acec7e746b52b200aa9ca9460