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

Change-Id: Iaa77155f762c09068c273dfd65b185ffc8fb2057