the changes from the last two commits

Change-Id: I6a40e7071d463e63d3331fd38500c76ebbe74513