The following method was added at the bottom and is now moved to all
other methods marked as protected.

This is a follow-up patch of 401a454c.

Change-Id: Ib536f93f1565a128a3bb5dff12496005c51acb83