[automerger skipped] Merge "Fixed unit test failure" am: c738117c am: be33d636 -s ours
am: 5321c797 -s ours
am skip reason: change_id I3bafe091c160942d6e75559eea1744e5b5a5e270 with SHA1 a54cf283 is in history
Change-Id: I2013b0da7c6c8a29fe24842a698b391ba3cd32da