Merge changes from topic "b/64114943" am: 98caf20a65 am: 938291c770
am: e074b8045b

Change-Id: I04dc372be6e41d9c5d1d2248da24dc867fbce7f8