Merge "log when waiting on a servicemanager" am: 377fc5aadd am: 300da2feb3 am: 49f1cf822c am: 1ffa1624d7

Change-Id: I9e68d6e6e78446819e40b1b83b2c55c26fa27290