Merge "Fix support for birthday on February 29th with year omitted" into jb-mr1-dev