Merge master back to ccng-side-by-side (squashed)

Change-Id: I2ef61fc09786f3a781fa245e8e24967fab2183e3