tree 4c9f03d1b7e1c35d0ac42b6b075511d129c8eeb1
parent 16d7c2ef3005ed06429c302b092f71681a766908
author Rob Tsuk <robtsuk@google.com> 1555429772 -0700
committer Rob Tsuk <robtsuk@google.com> 1555429772 -0700

Get rid of duplicate code

Use structure update and default to reduce duplicated
code.

Change-Id: I6076aa0d3c63c83f312e2f954ce1ba017208bb3a