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

Change-Id: I1ebe58cc4c7162931ad8679f87ade288489d4e8b