Added changes changes from Android Release 2013.05.18