Merge "Fix missing Result::ok() call in init" am: 8d144f6612

Change-Id: I37ecbf07fe122fa4998f3cb174e96e49b94f5181