release 2016-06-01
Tweak a couple of things for style. Change-Id: I53aa400704a08b2ac453237afb388c9a2b0fbe17 Reviewed-on: https://code-review.googlesource.com/4910 Reviewed-by: Paul Wankadia <junyer@google.com>