Merge "Update summary correctly in Settings dashboard." into nyc-mr1-dev am: e3f29e46b0 am: a539715ae0
am: 8d76635318

Change-Id: I5196f72811a2a07a80b14b02ea6082f22296f1c9