[CODE_REVIEW] Code review android 2