Merge tag 'v25' into HEAD am: 3548f5a47e am: ccba30f242
am: 38c3389843

Change-Id: I0e66903a98214d145e5ed6564ed844dbe471421f