Merge changes from topic "fdsan_art_fdfile"
am: 025059b5bc

Change-Id: Ida066897038d6cf772d499588692aa1e25aa3710