Merge \\"Fix kati --no_ignore_dirty usage\\" am: a6f510c776
am: cf771ed98f

Change-Id: I8d199811ed752acbf464016cdf23f5ca9d818a6d