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

Change-Id: I1f7fd4795bb1523f87703d35c5a16d43d32b86e5