synchronization with C++ version
Merge branch 'ice-cream-sandwich' into beta-ics