AOSI

http://www.google-melange.com/gci/task/view/google/gci2014/4965114767736832
Revert "AOSI"

This reverts commit 90f9ded646e7265837960a528076a41b0723faa9.
AOSI

http://www.google-melange.com/gci/task/view/google/gci2014/4965114767736832