Need to rebuild images after commit bfa3ed0a Bug: 18211592 Change-Id: I10c7353ba0fc216ff73c3ff16480c7fe9da13f2d