Change-Id: Ia312d73584a03491e8d574f424295b64df6de174
Avoid Seg fault on Windows Change-Id: I3901c003dd33222ec9e2600c519d8503f5e81c01
Change-Id: Ic4881305b6332e217f3d3127dce7e9d9d0a7df11
Change-Id: I9d853e8d417ef75b522184d83646ec4b9fa8669b