Merge changes from topic 'bind' am: 7726057707 am: b20213cf7d
am: 477d8f85d7

Change-Id: Ib16f2550ad2e93795d9881c051cb4f33bfa802a9