Merge changes Ib99e9aac,If5e3aa0c
am: e64a242cb0

Change-Id: If77798dd3983190afd64cce384007d8bac6af3f8