DO NOT MERGE - Fix build am: bf835e4525
am: 98b31b9270

Change-Id: Ib3dd2d315096bcb31dbfcd5be66f00d482594c9b