Pull otter-common from jellybean-mr2.1

Change-Id: If01fb8fd7006451e63f5a3f81d082b2f80d7c556