Do less work on configuration change. am: 494f0dedb2
am: 333cda7967

Change-Id: I1d86979954957c714f09df69727c9ac6a48f30f4