Updating to support Lollipop (5.0) release.