Merge changes from topic "turbine" am: 872246de0f
am: fa8b66f5cc

Change-Id: Ida5ba29574e8aaf8ac3c63b243c42f4a1c7dc5b9