Update AFTv5 to wmf/1.22wmf15 branch which includes live hack to fix fatal

Bug: 53821
Change-Id: I4ed8d053d7ac1fddd5b95e3155f1502c2feae6de