am 9c66e138: am 40990623: Merge "Remove Atom workaround."

* commit '9c66e13813ca75ba6f6f311fc7c0b18ff8152439':