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

* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7':
  Issue 3395734: fix media server restart detection