Merge "precisedataState refactor part 3" am: 2351fa8b8f
am: f7f229bc1d

Change-Id: Iad8b0677d1853957582c20a86c242bff3512f869