[automerger skipped] Fixed unit tests am: 23616439b6 am: aac74c5c52 am: 92c4277527 -s ours
am skip reason: Change-Id I5ab885bc5c4c8673e52cad3072f23fcd10ae80ce with SHA-1 13c9af0b2e is in history

Change-Id: I4408da5150c19abcdce46ca7be3e2821b12fff60