am bba103c6: am c8c9ebe8: am 581a3334: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1

* commit 'bba103c6d54ae6db1e756cabb1afbbc9b98972d9':