Merge "init: Convert a single-element array into a scalar"