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

Change-Id: I54d0fd622bcd1eda83f3c0fed1c4c480a8267e19