Merge "Added indication update mode support" am: 682500aa42 am: 1d73790c0c
am: 5dd5ed513e  -s ours

Change-Id: Idfa0eede4328e63f836edc49293ca59fb566bfc6