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

Original change: undetermined

Change-Id: I90aff7e9c57009022d7d64b56fbec906eaffd4d4