Update to support 3.1.0

Change-Id: I75f5bd536b25ad84fb05b108c2b03280bf76b2a1
15 files changed