Merge "Added indication update mode support"
am: 682500aa42

Change-Id: I796c9b2d58bfe2c6ec0e0f84d74a35570dc220ae