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

Change-Id: I8d001f14cc2652b21959d3e60c261c2ccbdddb25