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

Change-Id: Ia756229dc6ec818c8ffbd9f703127da1e833798a