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

Change-Id: Ie95de6fe8e14339d8f077437172353fed511f3f7