Merge commit 'f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp * commit 'f467ca08dda9efece674efb0cc70c45fab4973a6': More watermark work.
Merge commit 'f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp * commit 'f467ca08dda9efece674efb0cc70c45fab4973a6': More watermark work.