Merge RP1A.190822.001

Change-Id: Id60900c70bfaa14572ef8ed3306ef44a7c70917b