Fix-up for I4ad01776c79

Change-Id: I1b90b8e50afa90f7ae19f4f510abf0d87a9349e5