Merge changes from topic 'post_startup_methods'
am: c5515fd968

Change-Id: I38392639e8a78c30f094e689414fd9beb3e7c4f8