Merge changes from topic "am-2b228b69918a42e59bfbe1e26bf4796c" into oc-dev am: db91ff254d am: e9ea16ec42
am: 72e5dfd2a6

Change-Id: Ib7e7f16dd772d711358ece5e9d867df7596928ea