Merging in patches from jroll

Change-Id: Iae1e066cb19512eb929ba1b9946df44cbf676488