Revised and addressed vendors' comments

Bug: 27314812
Change-Id: If00be994381937a05011d3efea175bd6385c08e6
1 file changed