Merge "DO NOT MERGE - redo  Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread