First working version for hotfix release.

Change-Id: Ib867aaf1608978099f518ed39a7c6cfcd94daf9f