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

Bug: 53821
Change-Id: Icb5b0ff83fe032542efa68d62942c86c0cf09000