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