Merge commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f' into gingerbread-plus-aosp * commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f': Follow rename.
Merge commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f' into gingerbread-plus-aosp * commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f': Follow rename.