Launchpad bug #1353573

Change-Id: I745739e5939d8001f10384e3c85e94967aae20cf