Merge "make update-api" am: 07fe9042cf
am: e33d0f594e

Change-Id: I32a054929b04211c36394db8029f6bf651209991