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

Change-Id: I2d2d45e881f2bc6eaa2d63e37a8228324c37e8af