Merge "Index the System status page" into oc-mr1-dev am: 6203bde8d3
am: 8896df965b

Change-Id: I70141cb7f89794f734a33b2f90e470e1554c3320