The light at the end of the API code format updating tunnel

Change-Id: I12fdb71bc87a8ad5ed5b9f1fe9c06bd0f7154e9a
Merge "The light at the end of the API code format updating tunnel"