Merge changes I59b5f641,If438f1b7 am: e7194f7204
am: ef80b500ae

Change-Id: I9cb3f7d3a07c470b1df48d4d8e588a02abe6437a