Merge changes from topic 'post_startup_methods' am: c5515fd968 am: cb2ea7bd62
am: e1aefd57af

Change-Id: I1b67a4c97ced2e4ed123126991a712b77b8d7138