Commit before vacation

Change-Id: Ib4e4cedad2480ed7a26668ca7143e0c0a10d077c