As agreed with Adolfo (and others) at the Design hangout on 2014-12-10.

Change-Id: Ibe0e8075566523e746866b9d2c15c348c345d2df