Merge "Refrain warning when not appropriate. Do not merge" into gingerbread