Backout changeset 99e3a0501c52 and 0616a4ae8aa2 (bug 842681) because of android robocop orange