Merge "Added indication update mode support"
am: 03664c94ae

Change-Id: I17685418cc44e78e3bdbd69d68591efe7d2922e5