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

Change-Id: I1a6cc8d995dad4e2ac06f046a693bdace767d79b