Improving "Add automatically" recognition
am: 34828b1942

Change-Id: I413cc1a05bac3e3ad6ce9eded75fe1d2ca32cd2b