Merge "Fix an error on bootloadermessager test teardown" am: b694ba8aab
am: 536989892c

Change-Id: I457f30c36fde0dd407a9684fbc7c2d68ac2b94c0