Merge "CleanSpec for new system_other layout" am: f89f29d669 am: 5a6cf80073
am: 73852ff056

Change-Id: I4ebdc95fd5b88c78d5fd063eaee575fa250a96dd