Merge "Add support for preset ANW buffer mode" into oc-mr1-dev
am: 5f03369e25

Change-Id: I05f800f7c941b20e99557c33272c05eda20e6b7f