Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am: 08254e5b4f
am: 723fbd06a9

Change-Id: Ief7d0f6e9d90c34f8b9405d4d13c4080f669c15c