Merge "Implement code sinking."
am: 43e07b6b16

Change-Id: Ic8dc79d5b0ee6d222d31645d0e49b619ab73026e