To avoid issues such as bug 567532, where developers missed to duplicate
code this change extracts the code into methods and changes the
implementation to call these methods.

Change-Id: I66b4aa3e60d5fd716b0c9ce1092fb8126e24c6b4