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

Change-Id: Ibe20dff657932eb7851dcbdc2d6dd41ab4f4668d