[automerger skipped] Added missing ASSERT_NE. am: ac7ac525b2 am: d98afb98d9
am: 740e0c6042 -s ours
am skip reason: change_id Id0f28d061dc5858fa00ef1bac5f7aa467d860864 with SHA1 70d25b813e is in history

Change-Id: I35691b0e5d8208c3de49a7e9974022525e76922a