Merge "Fixed Log session for ConnectionServiceFocusManager" am: 60419bf58f am: 8b61fe8c49
am: 25c615d853

Change-Id: Iff8c840eca56bd0c55db0d55dc45deb69c78b450