This patch addresses few minor comments in commit a659306272542dd38420cb118cc7b04b1e8cf377 Change-Id: Id5b48e3cc96c8807c471c947da3e233cebdf687e Related-Bug: #1526449