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

Change-Id: I04fee7bd437993dd762b75a06fefe7ed310b8b1a