Needed to run make update-api after the merge of http://goo.gl/6RC3I4 Change-Id: If6cf3a520ff14c37a2ba317b799d246be2b620af