DO NOT MERGE: Fix alignment of share chips. am: 4d271f3d9a

Change-Id: I21f0fc66e8c0ecc2a059dc25c5f7b4bf66f5cd1f