am 93e5295e: am 7d9a3d51: Sync with new fdo staging branch

* commit '93e5295e1c8df913f186952a83a83a9a8cf71642':