Syncing code with launchpad (rev 3253..3256 and rev 3257..3263).

latest commit d7cc4fe781
Alejandro Leiva authored