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

Change-Id: I09e7dff673a56fb3c51cde827ae783da32407a70