Merge "Light grey java.net.HttpCookie fields." into pi-dev
am: 75d3d96084

Change-Id: I873079b40dcdce17655f08d9d50bacc93cb52e91