Brings back lost fixes from a bad merge (fixes from http://code.google.com/p/cocotron/issues/detail?id=963 )
Brings back lost fixes from a bad merge (fixes from http://code.google.com/p/cocotron/issues/detail?id=963 )

cyclaero/cocotron,yuhangwang/cocotron,cyclaero/cocotron,yuhangwang/cocotron,cjwl/cocotron,cyclaero/cocotron,guestOS/guestOS,Suninus/cocotron,gemu2015/cocotron-sierra,cjwl/cocotron,gemu2015/cocotron-sierra,ruppmatt/cocotron,JackLian/cocotron,cneira/cocotron,Suninus/cocotron,ruppmatt/cocotron,ruppmatt/cocotron,crystax/android-vendor-cocotron,crystax/android-vendor-cocotron,cneira/cocotron,gemu2015/cocotron-sierra,JackLian/cocotron,yuhangwang/cocotron,cneira/cocotron,Suninus/cocotron,gemu2015/cocotron-sierra,cneira/cocotron,crystax/android-vendor-cocotron,ruppmatt/cocotron,JackLian/cocotron,JackLian/cocotron,cyclaero/cocotron,guestOS/guestOS,Suninus/cocotron,crystax/android-vendor-cocotron,yuhangwang/cocotron,guestOS/guestOS,cjwl/cocotron,guestOS/guestOS,cjwl/cocotron