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

Change-Id: I15b3cd0e2690ad1c9f5bc04afc3224dd771d7ae0