Merge changes from topic 'bind'
am: 7726057707

Change-Id: I6e0198eceaa85c97bf3b72791e4e5e1df5086091