Merge changes If94102c7,I8d51e8e0 am: 22b829c049
am: 0a34afb48d

Change-Id: If6178eebce1d66a8bda36ef20013913013046c7e