Ajay Panicker 70b3e38772 Merge "Make sure that the device name is not null before returning it" am: d4963e8035 am: 87d114ac3e
am: c6438a68d6

Change-Id: I90c31e9f1c304d6696908d3518c3e96940fea8f6
2017-04-04 01:42:47 +00:00
..
2017-04-01 22:30:30 -07:00