Merge "Add call super" into oc-dev
am: a41a968f10

Change-Id: I864d2ec8d19e37ee1cd849d6cefb216df79ff6dd