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

Change-Id: I9009793b2418e40af42e47c0ac1c3b315a4dfbd5