Merge branch 'merge-wimax_manager-rewrite' into merge-wimax_manager BUG=chromium:370264 Change-Id: Ic16f28e873c3c587e9fc7d66781f937ccb61fce9