Merge "Add clarifying comment" am: 7e3e5b6868 am: 2d717e3404
am: 8544224e1d

Change-Id: I892a4e537aa28655b659a05716b646e7e55850df