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

Change-Id: I66d4b521e2badcc160e0d66898d17314daf93ad7