Merge changes from topic "am-3bd7761d-0a22-43c4-98aa-44bfc62874ad" into oc-dev am: e17682a20c am: 6c5e30f60c am: 4d4c461237
am: 6fd4657ec9

Change-Id: If4db35cd97b14656c2e4aa4e94d0ae87850cabff