[automerger] Remove code duplication am: 98913d0c95

Change-Id: Id023fdbd3caa8d74e3f92a01e13d14af69932a65