Merge RP1A.190822.001

Change-Id: Ibb40545e7b7e33932f2d5be552ab52d99b2dc39a