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

Change-Id: Ica58c7112b460e39f8b469201a054a420f04c35d
tree: b56488c8e5499b87cca2ba28f13378074fd517d6
  1. framework/