Merge \\"Made severe and extreme alert configuration dependency configurable\\" into nyc-mr1-dev am: 338566df68
am: c26d7f3624

Change-Id: I286adf2ff6f989055b191065a1e737b494989bde