Update along with core library.
Merge branch 'khibino-projection-default-20130731'