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

Change-Id: I93f57d5bfeaad9c94f6b7460734125cc259624b0