am 5f3e9e69: am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb

* commit '5f3e9e69a16f5a7bc70f3f010c8aae91f287e941':
  Issue 3395734: fix media server restart detection