2014.9.12 -3

Change-Id: Ibec98c93b4a3d966b041a568caa27bceb7c1eafb