Merge "Add missing checkThread" am: fdb8dfdadf
am: 67793b0eec

Change-Id: Ia8f3182a1d765937a5901cf6f9063ba8c84eb258