tree 3a01ae3b6f71ba8b5d0c088351cf708140cf6781
parent e2c32e9f966cf9f2c9ed94bf0703344a2cca284b
author Gloria Wang <gwang@google.com> 1300751594 -0700
committer Gloria Wang <gwang@google.com> 1300751594 -0700

do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.

Change-Id: If724de60bd6da1becdffc815d5358ffe78629469