[automerger skipped] Merge changes from topic "back111085900" into oc-dev am: f0095ec4d6 am: 5e8e47d4f8
am: 3375c14aef  -s ours

Change-Id: I345878aeec43a19778f70e0bf325b3e278bab682