Merge commit '623fce3' into uritemplate 3.0.0. Initial commitcd  of uritemplate 3.0.0. am: 43c5a5f39f
am: eaee30993c

Change-Id: I3b3a1a74bf31a87ade2647fb0090d6cf7eb52507