Merge "Merge "Copy the source before modifying it before dispatching" into...
Merge "Merge "Copy the source before modifying it before dispatching" into rvc-dev am: 31bdec92 am: bb33b44a" into rvc-d1-dev-plus-aosp am: acbfe4fa am: 524e3101
Change-Id: I5094c39c05310becc0c77500a811298022114437