ref: 66324d501a3d0e5d2dec74020231b52bcb801652
parent: 8d3d2b76f304f622a5e2d2e54416e1188a697f61
parent: 9c20cedd9365367e19cf3abe0c47fd86377402ee
author: Deb Mukherjee <debargha@google.com>
date: Tue Jul 2 10:02:53 EDT 2013
Merge "Clean-up in forward update to use mapping tables"