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

Change-Id: Ief7ec70c50fa2b64a423df2cdf2522d4ad288bb4