Also fixed a few documentation problems. Change-Id: I52cfda8f04635235fabef617af482a0ce66970ea
Change-Id: I3d43205b81d168c60f7ab2b7f246bd8a07e68e43