Merge changes from topic 'disabled-reason' am: d0fc3f1383
am: b858ffbe42

Change-Id: I5138cd1713ccecac8fa304275aec88734c040ffb