Merge "Follow removal of -host suffix in system/timezone" am: 110840ab76
am: 824777f373

Change-Id: I6e4b4d11da99d55c46f1cc5653b607cced999ce1