Merge changes from topic "turbine" am: 872246de0f am: fa8b66f5cc am: 5d52f85261
am: d1bbc2b26c

Change-Id: Ia2073afb32692443313ec7f83d4887e836220e2b