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

Change-Id: I8b72e1fa8dce81f65366136fb807879a9894a7af