Merge "Added indication update mode support" am: 03664c94ae am: 3ab2a5bced
am: 1b7ce444f2  -s ours

Change-Id: I0b5382db36999e65f56b738acb92c4e24dd7e076