Merge "Don't update the same indication" into rvc-dev am: 1eb9db6ab8

Change-Id: Ic684607b4dd731205b4076ba843e21d6b3e03c3a