Merge "Add callback for notifying that startup is completed" am: c213de444f am: e117649fba
am: 21c2b5ce66

Change-Id: I81f9a128beb4056484bdf0720639b7f5e0d0cfac