Merge branch easysetup into 'origin/1.3-rel'. 83/22483/2
authorAbhishek Pandey <abhi.siso@samsung.com>
Fri, 15 Sep 2017 06:23:00 +0000 (11:53 +0530)
committerAbhishek Pandey <abhi.siso@samsung.com>
Fri, 15 Sep 2017 08:42:06 +0000 (08:42 +0000)
Change-Id: I2cf5e7a25ab985f2b2e7b613ef0cb8af7dd3a851
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>

Trivial merge