tree 5cddec395eabc969933e92493e6314d132eaa1f5
parent 542621c7f1c042feabf55123600e856c1bce41ee
author Suchitra Vemuri <suchitra@onlab.us> 1534364680 -0700
committer Suchitra Vemuri <suchitra@onlab.us> 1534364813 +0000

ported minor changes from master

Change-Id: Iea96378e168dbb023c9cca98a94a85cab248a36a