Merge changes from topics \'offline_operation_hours_part5\', \'offline_operation_hours_part4\' into nyc-mr1-dev
am: 734c550c59

Change-Id: If9d9c8e960fd526e0d6d6df5189ae71de4802421