tree ba929cc3609584be4ca38abdcd807d80d0b6212f
parent 310962976d575c0a97ec7a768e9cca0b2361daea
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