Ported change from sixpack.

Change-Id: I4d4b0dba4522208fad2014acf5a9334329a1e01e