Remove unnecessary 'pass' statements

Change-Id: I328ff59128100f9de5160c11f817e09186e44d9d
Closes-bug: #1355112
Merge "Remove unnecessary 'pass' statements"