Merge "Remove the clock view when DISABLE_CLOCK is set" into pi-dev
am: 6d4917b673

Change-Id: I2af9b5a6320f20fcf12b828b4b2bcdba10f2cf90