Merge 59fa028a from open-source master

Change-Id: I46a77b535ed15b474a6fe807b7630a0f2918c1be