[automerger skipped] DO NOT MERGE
am: eb2ae993ac  -s ours

Change-Id: Iea6fffe4f25d0775877bcecd881e0609e43a94cc