Merge "Fix sed command on Mac builds" am: 42a5dd9c41
am: ad7bf56b1d

Change-Id: Ibdb85a157037247e2a37d16bf974c9d9812801f3