Added Serializable where missing and ignore classes which do not need Serializable

Change-Id: I197b2d62282ee957458e05d9cac357df47f05e85