Merge "Add updateMethod callback" am: a0974dbc0f am: 7791ac2e28
am: 01712b1aa6

Change-Id: I4b5b26081030f71e90022495e7a5cbb7811e5974