Code review: patchset #1.

Change-Id: I9d525727c16bd0aa2b940d01e1f75ea33648ed31