Merge RP1A.190822.001

Change-Id: Ibd4dce52b458438afb5d36d9e7e05cfd7f2c0f72