Merge changes from topic "mingw-clang" am: b8f4fe4fd4
am: 057fb5bede

Change-Id: Iba7903ed0a07b36d616de9917281fbb7ff450eec