DESCRIPTION

Apply forward compatible change to other cases.

Change-Id: I97a740dea16bec00a141683170705a2659c3281a


COMMENTS

author: Daniel Blair
date: 2012-05-03 21:47:12.229000000

Uploaded patch set 2.

-------------------------------------
author: Nora Conway
date: 2012-05-03 22:01:44.088000000

Patch Set 2: Looks good to me, approved



-------------------------------------
author: Daniel Blair
date: 2012-05-03 22:17:37.800000000

Patch Set 2: Verified



-------------------------------------
author: Daniel Blair
date: 2012-05-03 22:17:38.401000000

Change has been successfully cherry-picked as 0c59047ad2233b6cf9f9a5ee890019d3b15152ee.

-------------------------------------
