ref: 9bf73f46f9ce98be0f62d5f858be3e2100ddae5d
parent: 24bc1a7189724e1b67703a6165ec7e170ce784d6
author: Yaowu Xu <yaowu@google.com>
date: Mon Jan 14 13:03:34 EST 2013
fix a number issues that cause failures During master jenkins verification proces Change-Id: I3722b8753eaf39f99b45979ce407a8ea0bea0b89