Merge "Enables registering/unregistering multiple update listeners." into pi-dev am: 4aff01310e
am: b700644d0b

Change-Id: Ida0192ed2d3e2221166f36c443e103bc65586894