Merge "Restore preserving mutability over parceling" into rvc-dev am: ac774e3304

Change-Id: I164641b941a37b3b576acccb0cf9d8c77340683f