Minor changes which are based on +jdk7 am: 46f6a15804
am: b174a71982

Change-Id: Ia05474c2649722b4ae677c75080c12c300376565