Merge changes from topic "am-a79c39cd13fd4c62b75e3035afb8585c" into oc-dev am: 0c1bc6b5f2
am: 87aa9543e6

Change-Id: I607fb4194845628a00e2832828cfed093682cef0