This resolves the content direction issues identified in bug 33175 Change-Id: Iaf61fb9e8ad0ba3ab70ffa00c75da4c6f01aad61