Merge "Clear the entries in updateState" into rvc-dev am: 861d3446ab
am: 70218097f4
am: 339b8e15ba
Change-Id: I9e72dc48b942f9188196210e6b701f49c930fb8a
This commit is contained in: