Merge \\\\"Fix kati --no_ignore_dirty usage\\\\" am: a6f510c776 am: cf771ed98f am: 018d5d174a
am: 5fcfc056ec

Change-Id: I574d3ecadc189ce43baca15a0c442eb0861d5e28