Merge changes Id458f4e0,Id51aee37
am: 97cee9e500

Change-Id: I4552e27c1f5572ea1f9dc25d65822b5e8ba36bf3