Merge changes from topic "offlinesdk-docs" am: 003f49cf0c am: 7e1e76a6dc
am: bd2aeeea3b

Change-Id: I2aef067642f21e7223aaf12b6889a7c8066f0d27