Merge "Fix typo in tifast.cc" am: bb071ee44d
am: 02aa7613ce

Change-Id: Ib8431d7c929df2ca977a0a0be1bebd2f86f1eca3