Merge "Track movement of ICU .dat file"
am: 9e80affb08

Change-Id: Ia3b23c056fc7761ac16523732711df7ad0c318b5