Merge "Adds vishnun to owners files for wm/am" am: bcf293c674
am: 863ee68e24

Change-Id: I43fd94640bd21dd1bb0cdd49f1df5d1d4bf25fd1