Bump version to 1.6.14 am: 84a3498234  -s ours
am: 3d5d0f5e33

Change-Id: I7ee43850503bcb7edde2306899d36daf5e0e55e6