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

Change-Id: I624f17970f34c2e81123e9fe537ba21d4d6dee3a