Merge branch stable-1.14 * stable-1.14: gwtorm 1.14 Change-Id: I70052e116b77c02f70d2994c3157d704279e0176