Merge changes from topic "am-72600c4d-a38c-406d-a8bf-f12e7c40eac9" into oc-dev am: 99289a6263 am: 9cbdeacc45
am: 1337084199

Change-Id: I867cd49a0f49eb56b3e5fbfe4623ad474026d201