Merge changes from topic "move_to_go_defaults_512" into oc-mr1-dev
am: 241539e1ae

Change-Id: Icbce5fed1a6602f12d31f2ac31544b4bbfa53c76