Merge "Fix empty mac .toc generation" am: 7bc7704921
am: 8497a34201

Change-Id: I840fa05db353abd5e1adc959246113c04bb5f0f1