Change-Id: I093cf4f9ea60f00e187aeb4a548f3f5789d87fa1 Fixes: 73953880 Test: make update-api (cherry picked from commit d61db603)