Merge \"Fix invitation request from persistent GC\" into nyc-mr1-dev
am: 72abb6a42e

Change-Id: Ib45f08c9209b69cc811c268cce499e542c1d2efd