Merge commit '82df16c6543e2c47056c14799845621717ac2b3b' into eclair-plus-aosp * commit '82df16c6543e2c47056c14799845621717ac2b3b': Address romain's code review comments
Merge commit '82df16c6543e2c47056c14799845621717ac2b3b' into eclair-plus-aosp * commit '82df16c6543e2c47056c14799845621717ac2b3b': Address romain's code review comments