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

Change-Id: I0227bb930e368e92491fdc977e07c8ab28fea8d8