Build fix
am: 2e08409732

Change-Id: I8a9d366edc5da6d786913d2cb22dee97faacaf06