FALCON-2308 Addressed review comments
FALCON-2308 Addressed review comments

nperiwal/falcon,InMobi/falcon,InMobi/falcon,InMobi/falcon,nperiwal/falcon,apache/falcon,InMobi/falcon,nperiwal/falcon,nperiwal/falcon,apache/falcon,InMobi/falcon,apache/falcon,nperiwal/falcon,apache/falcon,apache/falcon,apache/falcon,nperiwal/falcon,InMobi/falcon