Merge changes from topic "fiemap-writer-1"
am: 32b695daa7

Change-Id: I9725ff0adf14304c9b545b16e6b880aa9af8234c