Another lost commit by git

Change-Id: I3d722c5cc872044174b0e0cc644e6f537f8197a5