Merge "precisedataState refactor part 3"
am: 2351fa8b8f

Change-Id: I7e2df1c9acf50db730e576213c27fe22dcddc502