Merge commit '6f86e7ca30f4934473150e40c5a5853b24e9c145' of sso://googleplex-android/platform/external/mockftpserver into HEAD
Change-Id: I255dc83c182d8779da8b1f1e0b23679346736bcd