Also fixed up backwards documentation Change-Id: I00c36aa751a79ca86a754e049a6da78cbb417b81
Change-Id: I908222ad3788ebe330aa58831cda139da32becd8