ed2cf2f5e5
It's a followup to 73a1812c5856be635827b6c6de81b39c22346457 addressing post-merge comments. Change-Id: Idd458ad6ef29e4eee2f9e537b4eae39d26eb9f64