Merge "aconfigd: use file digest to determine if stoarge files have changed" into main