Merge \"Reduce contention of ApplicationsState locks\" into nyc-mr1-dev
am: 9e133205e3

Change-Id: I3ac7fca652b60ebc66e8804e31c8cfd034b8b037