ref: 39c91d84ed3f0e7a8828b17da86c2bc1656bb24b
parent: 8df1b869a28496f4e6d278f14732d4d9d0a42fbc
author: Paul Wilkins <paulwilkins@google.com>
date: Tue May 27 11:40:33 EDT 2014
Re-factor some duplicate code. Change-Id: I89a1dbea39c50c7633f746d9c93fec3a289f1b42