Merge branch 'master' into cherry

Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: Id6b00a658734948cc1d2bdd06f17aca2ffff676c

diff --git a/ric-dep b/ric-dep
index bbcea34..e38909d 160000 (submodule)
--- a/ric-dep
+++ b/ric-dep
@@ -1 +1 @@
-Subproject commit bbcea345ef81e46f2fbd01e81d8870a3f0ed9404
+Subproject commit e38909d471f83d7b9ca051bd8deeee3d7c9a167b