Merge changes from topic "share-buffer" am: 54c3572e99
am: 0005ac0e55

Change-Id: I143d8e7a6bb7896641d50e336885523219da254f