Merge changes I06bea24c,I8e2e24af am: c7cbe12cfd
am: 53c1004bf0

Change-Id: Icba545975b51e8ea76baeb6cfb6681fd27664c89