Merge "Merge "IpManager,DhcpClient: catch some errors and better logging" into nyc-dev am: 5486aabc74 am: f152a8ed35" into nyc-mr1-dev-plus-aosp