merge with http://sourceforge.net/p/me722-cm/code/

Change-Id: I41e1bf17c65c9a6e1dfba887a6bd67c7ac7fbba9