Fix from Merge.

Change-Id: I7466ee253fab077426571da134bd8c358fa4eb61