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

Change-Id: I7f5afdedf253840c0bbd73ad8e52116b9667ee71