Merge "docs: Update Imageview JavaDoc comments" into oc-dev
am: 62a24e9493

Change-Id: I480054acc8be3934bb7ad25cc932da380fab5d02