Merge "Add metrics logging for Settings -> Help & Feedback" into nyc-mr1-dev am: d5f96424 am: 6165a83e am: c13f012a Change-Id: I1b1b2ae772e1fad028206e91b57fe338cf956e78