Merge "Add caching of build id in MapInfo object." am: b26b07d845
am: 2cb6c40c2b

Change-Id: I86a4d9f040b7508d551b27fa4050687f261a9bf6