going to merge Swapnil's patch instead of this patch as it relies on real system output rather then looking in files on the filesystem which differ between distributions.
This reverts commit 5c5e903973a9db4541196fbe9fcb99ce66c5cfa4.
Change-Id: I3e474620c90c1f7b2f5e16106f2c18b2058e169c