Merge "Correct the parameter length for core_initialized()" am: 4efba4e0ba
am: ae09f03596

Change-Id: Ia2ba2c1405c9a2904accb8af9831b86a97cd167b