Merge "Added indication update mode support" am: 03664c94ae
am: 3ab2a5bced

Change-Id: I82fc7c5e7b439dd202c48dddbb1e788612aa613c