Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am: d05a3078fc am: 4b2dd5249b
am: f7a4ced7e8

Change-Id: Ia9ca0839e05779d02560b07e1ab7103d9779c06e
tree: 8176e3f3ced18d4629813787626327c5e07193b6
  1. framework/