am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom am: 693ee83a6c

Original change: undetermined

Change-Id: Id383cd417423bf10b36a2fa72dca201f4657114d